Done but no testing bound to be a few bugs ill iron out Thu
Merge branch 'master' of https://github.com/rlweb/DIMS