Added player block. Refactors, cleaning up