Backup Commit

I'm going crazy editing the UI and fighting the bugs!