Removed all template and parser things and made some changes