more and more changes
Think I got it working