intermediate checkin - nothing more working
working setup now