Initial Version with some things todo.