Terror 11

Initial batch commit.