Progress

Found some other bug... Still working with it.