Changing the way properties are handled, and making baseUrl a property should it ever need to be changed in the future