More progress
Finished working on JARVIS-399