Lots of changes
Did not use nested_attributes for now
Did not use nested_attributes for now