Awesome feature

jasonadeliaTR finished the awesome feature lets pull it into the master