Status clean

An easy to merge version of the status-merge branch