Flags for arguments, start of some random stuff
Merge branch 'localchanges'