Added structure and stuff