added todos and fixtures.