First try at adding inertia - still WIP