Added a convertor class, removed untested stuff
Forgot to remove useless comments. Sloppy