Data abstraction layer built out, finishing view, two-step check left