Why yes! I've been lazy with it but that's way better. I'll do it in a separate branch, but I'll do that ASAP.