#27 Workin on the new structure