wip
Added automatic motion class