Added some more testing stuff in this branch.