Commit before re-factoring...
Total corrected for aces, display still wrong
Some cleaning up and first final commit