All work up to July 1st

Before starting making some order