Updated the signup API. Changed naming style.
Merged in functional.