things should actually be working now. should test when I get home