incremental adaptation

Ready to get involved?