Cleaned up add church (a bit)