Fixes; Added rudimentary line template (needs work)