lots of changes, setting up registration