Rewrote some stuff, took out paper organisation part