Both joins working

Only thing left to do is append "2" to the end of duplicate attribute
names.