revamp and big cleanup of v2, not complete yet, WIP
ignore stuff