core refactoring seems complete
working on converting signup plugin