Almost there, still need to fix refs