Some more structure added

Test seems to work, need to check w/ iphones