Lots of changes, getting ready for deployment