Lots'o changes. c: