Refactors functions into namespaces, renames many functions, cleans up some logic
Refactoring, Bug fixes, A new strategy