First working commit, just the class without any service or helper