Major update

Started register
Started settings
Update tests