Commit 18

Included Nereides, freezing issue is back- different cause this time? UI
is killing me.