Class

Modules into class
several clean up, new TODO loop
main added
work on class and dictionaries