first commit - cleaned up - works for me