added some TODOS and some funcitonality in model