Yet more connecting stuff. Commiting my TODO and FIXME notes too