Fixing up lookup/finder
Versioning