More refactor, verify basic functionality