new res
new logic
merge
added wood