yep after a long time and my team's help