Small changes to the framework.
Started implementing the lab 1 basics.