implemented some more stuff
last bit