Commented out features not implemented with (TODO LATER)