halfway commit
cleanup, add pages