Dup code, standards, testing fixes
Major restructuring/simplification
Updated doc, finished read