Updated my WIP, let me know if I need to change anything