Cleaned up the model based files a tiny bit, but they are still very ugly and in need of some rewritting now that they are working