Some refactoring of classes, began work on surroundings