Finished up some association work