Adds features requested in #8, without inertia.