right. Added some todo stuff