Going to try putting the UI in.
Fixed merge conflicts.
Was messing up due to shared variables..