prep work on updating to 1.6...its ugly...