More implementation progress -- Still not functional