Worked on the proposal a bit, still needs architecture section.