got it working, need to clean up