Initial Commit
Fixed Controller and added some stuff