Bring Dev server up to date

Add files back in as needed.