merged conflicts with trevors stuff