Last commit before adding multiple collection functionality