Some progress on what I was thinking

Still needs more work