Some more outlining done