Done some more progress
Some cleanup
Completed initial refactor
First pass optimization
Minor tweaks