Glasslip 12

Initial batch commit.