neatened up the repo, possibly fit for public consumption now?