Did some work
Adjusted to new time object, added behaviours to Armin