Added some more skeleton structure.