Few minor changes for now. Need to clean up a few classes, and get the packages right.