Still fighting dependencies...