initial commit: mostly kinda-sorta functional (except for when it doesn't work)
Merge remote-tracking branch 'origin/master'