Putting some changes on hold while strider 0.4.0 stabilizes