Class nav

should be good to merge now