Began implementing argument passing (non-working commit).