Added some more very needed functionality.