Finished writing a (likely broken) CLI interface
Fixed a simple mistake
Fixed stupid conflict with remote that I don't understand