Tidied a bit up, model is derp. Dictionary is melting my brain.