added implemented todos needs testing