Pretty much done with refactoring; going to begin working on a string module