WIP
Fix exit code
WIP