Redid the whole thing because the original one sucked