Final commit to LDP_FILEVIEW branch so I can merge back onto develop