New sketches

Lots of refactoring too