Changed to using directives, but I need to fix the fadeout problem...?