WIP
Fix specs and update base
Resolves conflicts