[TODO] Adds some structure