Registration

Please merge this in to the master.