Merge pull request #80 from arpitgupta/master

Infrastructure to work with secure falcon
inital changes to start using the new methods
rename method
more changes to use the new code