switching things up, its coming together nicely now