Working hard to try and make this app into something I'd be proud to show people.
Getting rid of kruft