Awesome... should we comment these out and place a TODO next to them for the time being?