Initial commit
add the base methods
merge master