Flagging mostly done. Waiting on comments.
Added previously forgotten template files