cleaning up some shit
finally getting associatins working