Plastic

just re-synced to the viper release, and fixed major timing in the end....