Back to basics, removed all template code