Oops, forgot this from last commit
Did a MAJOR FRIGGIN machete chopping re-order or ALL THE JS app logic as per #594