added dev and testing stuff