More testing and debuging - it's working