working on getting register and manage seperated
fixed merge conflicts