Put create project back in

Add some elses for empty collections