Using wycats' Controller Code

Using wycats' Controller Code because he knows what he's doing