Update 1

Some Refactoring and getFinger functions....