WIP
TODO: Refactor handler