- adds villain uploader

- more tests