Yes, will move all of these to the interface.