hopefully this fixes everythign /me rolls eyes
getting there ..