Blink1 and TodIan

Made some changes to accomodate: Blink1 and Tod/ianhome and Tod/ianwork