AN-9

Fixed Bug, updated interface, pair programmed with Syed.