MOAR work on Jewelz refactor