Fixed service class, added generic presenter, specs