trimmed up movement a bit, more to come