Add todos, remove hardcoded stuff
Make it actually work in jar _and_ without jar