Moved message() out of draw().  Removed some functions to inline elements.