complete overhaul of build for lolli