Dev

(Work in progress because I'm not the most hyped to copy them over)