Working, just cleaned up template a bit