changed curry strategy, much more flexable, few bugs to work out