Feature/extend new skeleton

ok, this should hopefully be better