Took a break from nerding to play milk crate tetris in the van. Managed to refactor out 3 more crates by consolidating / getting rid of. 3!