back to working order, removed id from hash for now