More implementations
Writing the dataHandlers
Merged dev and master