Nami p1 - p2

Part 3 is close to being ready as well so more coming soon.