Initial commit and re-implementation of some cases
Updated javadocs
testing key update