preliminary changes to allow for more options when using the cli