File naming is now being handled gracefully and has been tested. Extension methods added for String