Glasslip 13

Initial batch commit.