Prepare for development of ver 0.3.0 (Fixup/add badges)
Move existing features into a new Badge Model.