Computer and Homework classes functional, but bug with taking computers.
Thing-taking bug fixed, some objects renamed. Branch complete.