Clean-up, monkeying with spring plugin.
Adding cola logic.