1.7.0 - Recoded everything