everything's here now

complete submission, hopefully I’ll have time to tweak a few things