Still refactoring how the funcation handles time, not working yet
Merge branch 'master' of https://github.com/bethlakshmi/GBE2