reworked everything to work with jade