Add Darwin and first cleanup