13 bases exist

Resolves #13 
Lots of changes, many questionable.
Give extra attention