Threw together some more testing stuff