Move specs around. Add presenter + spec