Post #1653451

@pixiesnoot @sylvie yep, this can also be done as a cheap upgrade for the Next later, i just didn't want to do too much feature creep before getting it shipped out