RC1 - Finished all major logic