finish solution rearranging
static factories

beginning to make static factories, revamping tests as necessary