Begin refactoring
Refactoring in progress
Removing now unneeded code
Refactor almost complete
Perform now back to working example, beginning test of extras
Extras testing complete, library is functional