TODO tons of NF problems to fix.
Still WIP