Add caves, solves part of #2