First pages commit
making more generic