Updated with work over the last month.