refactoring
adding missing parse functions
integrating Layer
commit to merge