still working on registration
working out some bugs