Getting users to a respectable level..
Cleaned up merge