Fleshed it out, should do for now