Old, Removed and Newer Features

Readds old features and adds new ones.