things are close to connected
I merged things
Things compile now too!