Initial support for N4

Work in progress