With Senator Mark Madsen retiring from public service, a new torch-bearer has decided to roll both marijuana bills from the last legislative session into one, big, fat bill.