Flags

Move from environment variables to flags