Create objects, fixed returns and __str__
Fixed conflicts
Fixed more conflicts