Initial work

Yep, As discussed, this just got left over. Will get rid of it.