whole lot of changes, i was too rushed to really do VCS