Initial commmit of working simulation