Added lists
Cleaned up server.go and cli.go