New icy depen
Device to resource change
Added todos