Merge prep 2

3 files were left behind for some reason