a bunch of progress and a bunch of stuff - tired :(