All tests passing, some work done to commands.