added data components. what a piece of CRUD