11/16 skeleton done, refactoring