Making progress
more!
Bugfixing