class work apr 30

not much due to git issues and some others