for now i'm pushing everything to master.  will create a branch for random commits soon.