Initial Push

Lots of debugging to work on