Comments out features that aren't complete