Started work on production

Production is about 2/3 done - I forgot about this repository so this
is a big commit.