Started to implement the new Default Template