Testing branch
Added dev branch for hardcore development