Making progress. Sorta