Net refactor continued