More clean up and some sketches