Add the ability to retry & start some testing
Add some more tests