progress. few TODOS here and there