adds dirty code from work in progress (going towards easier
motion adaption configuration)
adds more dirty code from work in progress