bdcd0f297d
whole branch logic wobbly better syntax needed, but working(ish) for now
whole branch logic wobbly better syntax needed, but working(ish) for now