Added some simulation work (to complete)