ok moving more stuff around