Fixed up stubs, implemented some