Fixes to get these changes back to perfect up and running state. Now this branch is ready to be merge with dev and master in a controlled fashion with the changes to the main database.