Re-did block functions, added get and put