WIM 1.0

Ready for testing and improving