I prefer all of the above to be aftermarket to keep costs down. The RPI should be as barebones as possible, with just enough core functionality to get the job done. I think they do a great job with the current offerings.