from/join
some issues, mostly figured out