FINAL VERSION HOPEFULLY.
changed a bunch, all validated etc...