moved structure around a little, added angular