Adds support for arguments, still kind of broken