got tests passing and added soem TODO fixes and removed console logs