Work on version 1 some more at work