Removed unneccesary commented out code - actual comments coming soon