First working commit, On Activate methodes not fully implemented