Cleaning up - Pretty much starting from scratch other than basic text popup.  Removing a lot of commented code.