Changed simulations, modifications of update functions in progress. Currently a bit broken since I haven't totally finished changes.