working on edit, and realized that my first approach may not the best, need to rewrite alot