Moar work on janicart overhaul