Updated todo
Updated system model