WIP

Added very basic support for CLI