Start working on way to add shifts
Merge branch 'master' of https://github.com/cybrairai/demoer