Reimplemented inertia
Added dataSource (WIP)