Getting there. Framework is almost done