Not as much as should be done, but the start of testing stuff is here