JARVIS-381 Initial steps