added some more things closer to done