Feature/skeleton

#2