ISLAND-60 - register functionality
Fixed hopefully bugs.