Objects

Changed character generation to use objects