Final commit from APCS! Buncha random stuff