pretty much done
woohoo