Ported old code and improved simulation
Pulled
Deleted 2 files
Finally resolved conflicts, pushing new code