almost done.....sheesh