#28 Fixing and cleaning up. Still more to do. Next is Rename files to condense to normal list.