Getting farther along, most of the logic and stubs are implemented