starting to look better

Still have a ton of work too just update all method and remove errors.
Though it is starting to look better and better by the min.