Closes #3, finished associations