Added ch1zuru's stuff

\o/