more skeleton work. Mostly done now