Added fleshing out of starting code, need to test