Initial work

Yeah, I know you didn't write half of this :) However you own the task and anything that goes into master is supposed to be production ready