Get things a little closer to working