Commit of work so far

There is still allot missing, it's there in spirit.