stubbing out some additional code and TODOs