Controllers almost works as inteded now.