[Close #1] Raise version - big refactor