proper associations set up, bad commit to much