Merged w/ master
My part no longer crashes \o/