This MR is to be merged into feature/skillMemoryGUI, as major changes there are not yet merged into master. If they are, I will close this MR and open another for master.
feature/skillMemoryGUI
master