Moved stuff around a little.
Added more placeholders