This is an old branch that i had but i never merged. I wanted to keep working but I am having some issues so I would merge this one and then create a new one to keep working on the arc.