More stubs, starting to implement basics