wheee
fix crash and add blocks, refactor
fix merge problems