Changed some things added a facade