Working, but going to change some things next commit.
Refactored some code. Made new helper library.