rebuilt from source - all previous commits intact--will readd features after testing