Add more tests
Reformat, add test
Break apart larger functions
Try 5 min resolution
Add more tests