AICP kitkat code refractor - WIP