Ikoevska patch 1

Transferring the rough draft PR here due to some issues with GitHub.
This one's based on Fatme and Erjo's changes. Still a rough draft, waiting for two more commands to be implemented and some other changes.