Added more features! Everybody loves features!