Lots of modifications. All class skeletons done.