incremental progress on this... need an evening filled with red bull.