More refactors
Added Nincodium Sword
derp
Merge branch 'feature/nincodium-sword' into develop
Merge branch 'feature/molten-nincodium' into develop