FINAL COMMIT

Kinda forgot to commit everything yesterday.