Tons of functionality added!