Terror 07

Initial batch commit.