Initial Push

Still some TODO items.