Changed a few files. Gonna have some big changes