Merged changes (packages evollrn and sim). Running from IntelliJ!