Started Integrating the systems

fixed old scripts and added the states and started working on the player
controllers