Added feedforward, tuned to complete the assignment and both bonuses