The First Amendment's Free Exercise and Establishment Clauses were meant to guarantee freedom of religion for all persons living in the United States. This was to be done by ensuring that government could not establish a state religion nor interfere with individual practices and beliefs so long as they did not violate public morals. The idea was to have the two clauses operate together to ensure state separation in matters of religion. However, recent caselaw involving government accommodations to religious organizations has emphasized the Free Exercise Clause with little or no attention afforded the Establishment Clause. As a result, intermediate factors like entanglement, endorsement, general applicability, and neutrality, that previously were used to assist the separation of church and state, are now called into question. This Article attempts to rekindle these factors by attaching a public/private distinction to the way the two clauses are understood, to ensure a more certain and clearer basis for the separation of church and state.