We'll be doing this eventually. It's a deeper cut into the code though so it'll take more time.