Handle arguments properly

This also introduces very poor rudimentary options