finished up relations and updated TODOs