pretty much finished :)