First commit
Class rename
Compiling. Behaviour OK so far
work in progress
fixes after compilation mistakes
Minor enhancements