Added a bunch of the structure and user components