DOC|WIP: Warning. Will break code. Variable name changes and documentation