Updated main with basic commands