Started major refactoring of library, currently broken.