added stubs & code refactor
11 files changed