Fully functioning Reshoot/New features

Fixed Reshoot/New bugs and finished coding