Fixed minor bug, and worked on trying to get the segue working without much success