First pass, looks like there is somethign wrong with mappedFiles as well.
Updates for meeting