Upgrading, commit some really old changes from main.cljs