More changes, more requirements, mostly untested but code starts and deploy dev works