Terror 09

Initial batch commit.