Commented out stuff we need to change when we have data structures
Removed some unnecessary stuff