Another commit. Still working...
First commit that seems to work a bit