Add associations and validations. All specs passing