Block a user
refactor and partial rewrite of codebase
WIP: refactor and partial rewrite of codebase
Merge changes from hgeryy2004 and balint1414
Merge changes from hgeryy2004 and balint1414