Ongoing work for CMPUT 301