Commented out some things that are not developed