Somethings are broken but here is my updated portion of the project. I am still working on revamping the view side of things and those are the broken parts.