Prepping to implement long overdue features