Framework Outline (cont)

The outline is more or less done. Just need to implement everything.