almost workign again.. except for motion