Closer to getting everything hooked up