NodeUp 53: Full review

Still work in progress... don't merge yet!