#wip almost there...moving too slow today should have finished this hours ago.