I've made some minor changes. Still looking for feedback, but for the most part it does what it's supposed to.