WIP refactor
WIP refactor
WIP use space for indentation
WIP shuffle & tinker