Conceptual testing

Bunch of stuff added, but they will not neccesarily be permanent.