work on associations, changed models, added migrations