working on pulling shifts into directive