cleaning up what we have and adding a bmp for testing