working on structure, adding some utility classes