Fixing the fall through that did not work
Formatting
Files for testing
Adding cache, Fixing converter bugs