More placeholder additions
Revert "More placeholder additions"

This reverts commit 4ca9a106164503783a837e38eb083f5c227a32d8.
Revert "Revert "More placeholder additions""

This reverts commit bf5f252f66e9cf4b3cbafd78a0e708d79b850e2f.
Revert "More placeholder additions"

This reverts commit 4ca9a106164503783a837e38eb083f5c227a32d8.
Moving placeholders to development branch