More cleanup, started work on UIL project.
I'm gonna stop looking at this for awhile, the code is starting to really annoy me. I'm going to look at some other github projects, see if I can (maybe?) find one I like and branch it.