Rearranging
Add command-line options