working setup (now with propper git commit)