Bugfixing and initial example

Some clean up, bug fixes and an extremely initial example. Für dich aus mich.