Added UI logic, banged head against wall, etc
didn't commit it all, oops.