Completed the basic slim templates.
Merging in God knows what.