Build on boot too
Big 'ol refactor