Adding functionality. Fixing specs tests, still work to do