big refactor, changed rake calling action and more options, added classes