Cleaned up and attempted to display visual feedback