Added all of drop code, took away buggy file reads in setup