Merging in the portfolio rework as it is so far.
Re-added posts lost in the merge.