Add block concept
Merge branch 'firstDraft' of github.com:Niktux/warrior into firstDraft