added testing stuff etc