Reworking of entirety of argument parsing (w00t!)