Added CLI interpretation
Updated file saving code