added registration functionality
Merge branch 'curr-3'