elliot's big-ass commit. about to start integrating with pmod stuff.
dear lord that was an annoying merge
MASSIVE COMMIT JACOB I HOPE YOU LIKE