Stack Issue

Some minor changes but I didn't want to get too far ahead. #51

Project delta-bot-three