[WIP] Refactor methods.