Final for now. Work on it next weekend. just making sure this works