more updates. still not finished but much closer.:)