Working

Lets merge to master because we have the MVP!