Updated names, added better tests, prepping to remove dependencies