Template change, added TODOs based on feedback.