Updated pages, created rough implementation to be completed later