Everything fixed, only need to implement controllers properly