Continued working on cli, can soon draw (hopefully)
Merged shit