lots of changes...check it out, I think it's about finished!