sorta working. pushing for brian