more skeletal changes. isolate my work from everything else