Simplified structure for now, removed unecessary classes, added basic operations