Add missing associations causing FK issues

not ready, opening for commets