final strategy added, still fixing some bugs
merged