Corrected DB Schema, not really sure how i fudged with it but it's correct now