switched branches

moved stuff over from one