Streamlined

Commented out lots of needed info, fixed the way that we got features