half baked changes, internet went out and i'll continue tomorrow