Temporary commit; builds but aborts when run
Fix abort on boot
Clean up hw_handlers.c a bit