Get tests passing for existing code. Add tests and work on files service.