Whitespace alignment
Finish implementation of new quarter functionality

Seems to be working, needs tests