Major re-factoring, increased accuracy and readability, foundation laid for mobile and proper O/S version distribution