Committing rough work before upgrade to 1.2.