re-orged SO MUCH SHIT, in the process of merging

taking blame for lack of communication since we were working in diff
repos oops.