cleaning up things and improving models
cleaning up models
adding assoc
adding models
adding models