Added comments, and all finished. Still having issues with attribute selection