Merged from dev

Initial Functionality