implemented all goals w/o unit tests