Finally fixed up everything.. No more simulation branch

Pushing all my code changes, no more simulation branch, we will just make a simulation folder on the dev branch.