Added library and made things prettier
Got rid of most of the crap, I think, and merged
cleaned things up again