Commented out some features to make it more manageable