Holy moly

Changed a lot!