Begin major refactor, create parse ns