started adding some structure