updated ox-tools base and db layers
Added my most recent additions
Removed some false starts