added base for units
Merge branch 'master' of https://github.com/zkc/NoEndNow