MASSIVE UPGRADE!!

Everything kind of, sort of..... works...?