First embedded records working - still needs work.