Changed to interface correctly with new Database Schema
Does not work... suck it