First pass at creating feature branches + Pivotal story