Last minute changes
Move utility functions
Prepare for testing
Fix imports
Fix imports
Fix bug
My hands are typing words