Fixes #32
Fixes #33
Merge branch 'feature/AI' of github.com:DAWacker/SleepyScientist into develop