Tried to eliminate statics. And extracted character set from Base40
Fixed merge conflicts.