Forgot some stuff [WIP]