This will make things slightly less of a pain in the butt for the time being. Someone remind me to fix this later.