Adding some kickass features!