Submission ready!
Hopefully cleaning up my current mess.