will nuke this repo after this commit, just wanted to get code in reviewable state