Cleaned Up & Changed ITemplate and Template