Add code for rest of argument handling
Should this be merged, or should we make some options do better stuff first?