Finish stubs/rewrite/rename hashmap functions