Added some skeletons, removed junk