todos done in pageclas (needs correcting though)