Updates to Back-end

Because we ARE having fun yet.