closing #35, starting #27, closing #1