Almost clean work, initial commit