A lot of stubs and TODO's added