Finished up structure diagram stuff