Initial work on making armature's less silly