Test framework in, need to decide on data structure