Work in progress, moving to using Keiran's resource bundles, paths need to be adjusted