Initial changes towards a working setup