Rename, and use git tags for specifying handin versions instead
Switch to numbered ref
Use logic notation used in presentation, still not good enough though