Large code revision. Might call it a 0.2 Beta release. One bug needs to be resolved.