More hackery. Not sure where this is going.