quick commit

pretty much done! :D