So, after going through the code, (I haven't actually merged this) it looks like paperclip is going to break the company updating. Does everything work for you? If you try updating different parts of the company is it successful or do you get a internal server error 500?