Began refactoring code to be more easily modified in the future
Updated README for current tasks