Inverts dependencies per Issue #84