More NovaPunch Engine Work (WIP)