Fixing services to generate interfaces and breaking out commands into separate classes. Batch command stubbed out.