branch testing commit
TL'ing last 3 tests
minor speed optimizations failed, still TL'ing
consider it stashing commit
Panding review on this bloody mess... Hate it, totally. ps08-3
Merge branch 'ps08-3'