commit before merge
Register and few stuff completed