Added some stuff for a school project.